Merge "More properly fix error message"